Fixed stuff in master