Small beuty fixes