Few other tweaks