Fixed a few issues with Hydra porting