Smalll bug fixes