Some light fixes