#12 Small fixes