#3 Small bug fixes