static bug fixes