Completed bug fixes for now