% Small fixes