composite: Some typo fixes

Spotted by @marienz.
composite: Fix race when loading kittens

The images can load in either order, which means that they can be mapped
in either order. To make sure that they show up in the appropriate
stacking order, just map them immediately.

Noticed by @marienz.