Various input fixes