- General bug fixes