Undo skip hack; Better error messages on piece click