early bug fixes