Fixed various types and screenshots