Finish bug fixes