Bug fixes for project