Fixed some stuff in application