Fixed some minor bugs with service