Gu issues 1

Resolves issues from GU's issue tracker:

 * 231
 * 264