Bug fixes for buggy samp