Few other cleanups