Resolving minor bugs