Fixed construct issues