Few other minor fixes