More syntax sugar (and fixing the last one)