Don't prepend win- to dock name

Also, fixed some small syntax warnings
Merge pull request #1 from jeppenejsum/master

Don't prepend win- to dock name