[GPad] Minor Fixes