Fixed 3 reported bugs