Fixed "some" problems