Bug fix/minor improvements