Glass Pick fixes...