Fixes

0000015
0000012
0000016

From http://bugs.snipestudio.hol.es login: guest
need tests to approve