Declaration file fixes