Don't prepend win- to dock name

Also, fixed some small syntax warnings