fix declarations