Few build tweaks