Fixed a few issues caused by 'dynamic' and 'object' not being treated as the same type when they should be (#202, #209)